From 6e11c3106a5661c172f2056f9da147c72708fafe Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Thu, 28 Jun 2012 23:55:33 -0400 Subject: [PATCH] GActionMuxer: disconnect group signals on finalize The signals for the action group were being disconnected when the action group was explicitly removed from the GActionMuxer but the same was not being done when it was finalized. This means that a change in the state of an action group that used to be associated with a finalized GActionMuxer would result in a crash. This would happen for stateful application actions after closing a window. --- gtk/gactionmuxer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gtk/gactionmuxer.c b/gtk/gactionmuxer.c index 22990a40e3..532eec4ca1 100644 --- a/gtk/gactionmuxer.c +++ b/gtk/gactionmuxer.c @@ -352,6 +352,11 @@ static void g_action_muxer_free_group (gpointer data) { Group *group = data; + gint i; + + /* 'for loop' or 'four loop'? */ + for (i = 0; i < 4; i++) + g_signal_handler_disconnect (group->group, group->handler_ids[i]); g_object_unref (group->group); g_free (group->prefix); @@ -485,10 +490,6 @@ g_action_muxer_remove (GActionMuxer *muxer, g_action_muxer_action_removed (group->group, actions[i], group); g_strfreev (actions); - /* 'for loop' or 'four loop'? */ - for (i = 0; i < 4; i++) - g_signal_handler_disconnect (group->group, group->handler_ids[i]); - g_action_muxer_free_group (group); } } -- 2.30.2